@@ -118,7 +118,7 @@ EOF |
||
| 118 | 118 |
|
| 119 | 119 |
# wait for mysql server to start (max 120 seconds) |
| 120 | 120 |
timeout=120 |
| 121 |
- while ! mysqladmin -u root status >/dev/null 2>&1 |
|
| 121 |
+ while ! mysqladmin -u root status >/dev/null 2>&1 && ! mysqladmin -u root --password=\${DATABASE_PASSWORD} status >/dev/null 2>&1
|
|
| 122 | 122 |
do |
| 123 | 123 |
(( timeout = timeout - 1 )) |
| 124 | 124 |
if [ \$timeout -eq 0 ]; then |